projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 64d892b) | patch
(change-log-resolve-conflict): Don't lose data if the merge fails.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 20 Jul 2007 20:41:58 +0000 (20:41 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 20 Jul 2007 20:41:58 +0000 (20:41 +0000)
commite6f0eab4f43726589321fb508dec7971003801fa
tree47d9904adf23bcd19de9de65db6c89208bf9ce1ctree | snapshot
parent64d892b038622683579f101808b5b3a2cbefba36commit | diff
(change-log-resolve-conflict): Don't lose data if the merge fails.
lisp/ChangeLog diff | blob | history
lisp/add-log.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.